From 5baafc865347226d5d66f190de976d9072efe0bb Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 1 Feb 2006 00:48:17 +0100 Subject: [PATCH] Define gnttab_shared_gpfn() for use in common code. Signed-off-by: Keir Fraser --- xen/common/grant_table.c | 6 +++--- xen/include/asm-ia64/grant_table.h | 2 +- xen/include/asm-x86/grant_table.h | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index e8b5d05b8a..efdef27aa3 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -481,7 +481,7 @@ gnttab_setup_table( gnttab_setup_table_t op; struct domain *d; int i; - unsigned long mfn; + unsigned long gpfn; if ( count != 1 ) return -EINVAL; @@ -523,8 +523,8 @@ gnttab_setup_table( (void)put_user(GNTST_okay, &uop->status); for ( i = 0; i < op.nr_frames; i++ ) { - mfn = __mfn_to_gpfn(d, gnttab_shared_mfn(d, d->grant_table, i)); - (void)put_user(mfn, &op.frame_list[i]); + gpfn = gnttab_shared_gpfn(d, d->grant_table, i); + (void)put_user(gpfn, &op.frame_list[i]); } } diff --git a/xen/include/asm-ia64/grant_table.h b/xen/include/asm-ia64/grant_table.h index 5bf3f68bd0..ff0aaae9aa 100644 --- a/xen/include/asm-ia64/grant_table.h +++ b/xen/include/asm-ia64/grant_table.h @@ -14,7 +14,7 @@ #define gnttab_create_shared_mfn(d, t, i) ((void)0) -#define gnttab_shared_mfn(d, t, i) \ +#define gnttab_shared_gpfn(d, t, i) \ ( ((d) == dom0) ? \ ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i)) : \ (map_domain_page((d), 1UL<<40, virt_to_phys((t)->shared)), \ diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-x86/grant_table.h index 38f46b69c9..3b2d1f76c3 100644 --- a/xen/include/asm-x86/grant_table.h +++ b/xen/include/asm-x86/grant_table.h @@ -33,6 +33,9 @@ int steal_page_for_grant_transfer( #define gnttab_shared_mfn(d, t, i) \ ((virt_to_phys((t)->shared) >> PAGE_SHIFT) + (i)) +#define gnttab_shared_gpfn(d, t, i) \ + (__mfn_to_gpfn(d, gnttab_shared_mfn(d, t, i))) + #define gnttab_log_dirty(d, f) mark_dirty((d), (f)) #endif /* __ASM_GRANT_TABLE_H__ */ -- 2.30.2